mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-27 03:33:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename cppflags-iterator.mk to libof-iterator.mk, remove extra-modules.mk.

Browse Source 
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.
This commit is contained in:
Zack Weinberg 2017-05-08 15:52:26 -04:00
parent 61f4fa7fd7
commit 2bfdaeddaa
17 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2017-05-09 Zack Weinberg <zackw@panix.com>
* 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.
2017-05-09 Stefan Liebler <stli@linux.vnet.ibm.com> 2017-05-09 Stefan Liebler <stli@linux.vnet.ibm.com>
* sysdeps/s390/fpu/libm-test-ulps: Regenerated. * sysdeps/s390/fpu/libm-test-ulps: Regenerated.

10
Makerules
View File

@ -794,11 +794,9 @@ endif
# The makefile may define $(modules-names) to build additional modules. # The makefile may define $(modules-names) to build additional modules.
# These are built with $(build-module), except any in $(modules-names-nobuild). # These are built with $(build-module), except any in $(modules-names-nobuild).
ifdef modules-names ifdef modules-names
# extra-lib.mk is included once for each extra lib to define rules cpp-srcs-left := $(modules-names)
# to build it, and to add its objects to the various variables. lib = extramodules
# During its evaluation, $(lib) is set to the name of the library. include $(patsubst %,$(..)libof-iterator.mk,$(modules-names))
extra-modules-left := $(modules-names)
include $(patsubst %,$(..)extra-modules.mk,$(modules-names))
extra-modules-build := $(filter-out $(modules-names-nobuild),$(modules-names)) extra-modules-build := $(filter-out $(modules-names-nobuild),$(modules-names))
$(extra-modules-build:%=$(objpfx)%.so): $(objpfx)%.so: \ $(extra-modules-build:%=$(objpfx)%.so): $(objpfx)%.so: \
@ -1327,7 +1325,7 @@ all-nonlib = $(strip $(tests) $(xtests) $(test-srcs) $(test-extras) $(others))
ifneq (,$(all-nonlib)) ifneq (,$(all-nonlib))
cpp-srcs-left = $(all-nonlib) cpp-srcs-left = $(all-nonlib)
lib := nonlib lib := nonlib
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
endif endif

2
benchtests/Makefile
View File

@ -123,7 +123,7 @@ endif
cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \ cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
$(binaries-bench-malloc:=.c) $(binaries-bench-malloc:=.c)
lib := nonlib lib := nonlib
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
bench-extra-objs = json-lib.o bench-extra-objs = json-lib.o

3
benchtests/strcoll-inputs/filelist#en_US.UTF-8
View File

@ -9667,7 +9667,6 @@ hr.po
libc.pot libc.pot
ko.po ko.po
ru.po ru.po
extra-modules.mk
intl intl
tst-gettext4-fr.po tst-gettext4-fr.po
tstcodeset.po tstcodeset.po
@ -13252,7 +13251,6 @@ sigset.h
atomic.h atomic.h
utmp.h utmp.h
stdlib-bsearch.h stdlib-bsearch.h
cppflags-iterator.mk
iconvdata iconvdata
MISSING MISSING
ibm1164.h ibm1164.h
@ -15245,3 +15243,4 @@ w_exp2l.c
bug-nexttoward.c bug-nexttoward.c
w_dreml.c w_dreml.c
s_nanf.c s_nanf.c
libof-iterator.mk

7
cppflags-iterator.mk
View File

@ -1,7 +0,0 @@
# This file is included several times in a row, once
# for each element of $(lib)-routines and $(lib)-sysdeps_routines.
cpp-src := $(firstword $(cpp-srcs-left))
cpp-srcs-left := $(filter-out $(cpp-src),$(cpp-srcs-left))
libof-$(notdir $(cpp-src)) := $(lib)

2
elf/Makefile
View File

@ -547,7 +547,7 @@ CFLAGS-rtld.c = $(SYSCONF-FLAGS)
cpp-srcs-left := $(all-rtld-routines:=.os) cpp-srcs-left := $(all-rtld-routines:=.os)
lib := rtld lib := rtld
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
generated += $(addsuffix .so,$(strip $(modules-names))) generated += $(addsuffix .so,$(strip $(modules-names)))

2
elf/rtld-Rules
View File

@ -142,7 +142,7 @@ endif
# Set libof-* for each routine. # Set libof-* for each routine.
cpp-srcs-left := $(rtld-modules:%.os=%) cpp-srcs-left := $(rtld-modules:%.os=%)
lib := rtld lib := rtld
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
rtld-CFLAGS += $(no-stack-protector) rtld-CFLAGS += $(no-stack-protector)

2
extra-lib.mk
View File

@ -108,5 +108,5 @@ endif
# This will define `libof-ROUTINE := LIB' for each of the routines. # This will define `libof-ROUTINE := LIB' for each of the routines.
cpp-srcs-left := $($(lib)-routines) $($(lib)-sysdep_routines) cpp-srcs-left := $($(lib)-routines) $($(lib)-sysdep_routines)
ifneq (,$(cpp-srcs-left)) ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
endif endif

9
extra-modules.mk
View File

@ -1,9 +0,0 @@
# This file is included several times in a row, once
# for each element of $(modules-names). $(extra-modules-left)
# is initialized first to $(modules-names) so that with each
# inclusion, we advance $(module) to the next name.
module := $(firstword $(extra-modules-left))
extra-modules-left := $(filter-out $(module),$(extra-modules-left))
libof-$(notdir $(module)) := extramodules

2
iconv/Makefile
View File

@ -55,7 +55,7 @@ CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'
# Set libof-* for each routine. # Set libof-* for each routine.
cpp-srcs-left := $(iconv_prog-modules) $(iconvconfig-modules) cpp-srcs-left := $(iconv_prog-modules) $(iconvconfig-modules)
lib := iconvprogs lib := iconvprogs
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
ifeq ($(run-built-tests),yes) ifeq ($(run-built-tests),yes)
xtests-special += $(objpfx)test-iconvconfig.out xtests-special += $(objpfx)test-iconvconfig.out

2
iconvdata/Makefile
View File

@ -290,7 +290,7 @@ cpp-srcs-left := $(modules) $(generated-modules) $(libJIS-routines) \
$(libKSC-routines) $(libGB-routines) $(libCNS-routines) \ $(libKSC-routines) $(libGB-routines) $(libCNS-routines) \
$(libISOIR165-routines) $(libJISX0213-routines) $(libISOIR165-routines) $(libJISX0213-routines)
lib := iconvdata lib := iconvdata
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace
$(objpfx)mtrace-tst-loading.out: $(objpfx)tst-loading.out $(objpfx)mtrace-tst-loading.out: $(objpfx)tst-loading.out

8
libof-iterator.mk Normal file
View File

@ -0,0 +1,8 @@
# This file is included several times in a row, once for each element
# $(cpp-src) of $(cpp-srcs-left). It sets libof-$(cpp-src) to $(lib)
# for each.
cpp-src := $(firstword $(cpp-srcs-left))
cpp-srcs-left := $(filter-out $(cpp-src),$(cpp-srcs-left))
libof-$(notdir $(cpp-src)) := $(lib)

2
locale/Makefile
View File

@ -101,4 +101,4 @@ CFLAGS-charmap-dir.c = -Wno-write-strings
cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \ cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \
$(lib-modules) $(lib-modules)
lib := locale-programs lib := locale-programs
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))

2
malloc/Makefile
View File

@ -126,7 +126,7 @@ memusagestat-modules = memusagestat
cpp-srcs-left := $(memusagestat-modules) cpp-srcs-left := $(memusagestat-modules)
lib := memusagestat lib := memusagestat
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
$(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o) $(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o)
$(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz -lm $(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz -lm

2
nscd/Makefile
View File

@ -92,7 +92,7 @@ endif
# Set libof-nscd. # Set libof-nscd.
cpp-srcs-left := $(nscd-modules) cpp-srcs-left := $(nscd-modules)
lib := nscd lib := nscd
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
$(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o) $(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o)

2
sunrpc/Makefile
View File

@ -183,7 +183,7 @@ $(objpfx)cross-rpcgen: $(cross-rpcgen-objs)
# This makes sure -DIN_MODULE is passed for all these modules. # This makes sure -DIN_MODULE is passed for all these modules.
cpp-srcs-left := $(rpcgen-objs:.o=.c) cpp-srcs-left := $(rpcgen-objs:.o=.c)
lib := nonlib lib := nonlib
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
# How we run rpcgen to generate sources and headers in the rules below. # How we run rpcgen to generate sources and headers in the rules below.
# Setting CPP tells it how to run the C preprocessor correctly. Note # Setting CPP tells it how to run the C preprocessor correctly. Note

2
sysdeps/s390/Makefile
View File

@ -18,7 +18,7 @@ include extra-module.mk
cpp-srcs-left := $(foreach mod,$(s390x-iconv-modules),$($(mod)-routines)) cpp-srcs-left := $(foreach mod,$(s390x-iconv-modules),$($(mod)-routines))
lib := iconvdata lib := iconvdata
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
extra-objs += $(addsuffix .so, $(s390x-iconv-modules)) extra-objs += $(addsuffix .so, $(s390x-iconv-modules))
install-others += $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules)) install-others += $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules))