diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-19 12:13:54 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-19 12:13:54 +0530 |
| commit | 9cd4747089e6b0d6ed6b2b6c75798912489c7bab (patch) | |
| tree | b8804d1fcbe700d16978f82cb76aa8a5bbcf8544 /iconv | |
| parent | d71035bd9a3a1dc5077ab8d978398f2f960d3555 (diff) | |
| download | glibc-9cd4747089e6b0d6ed6b2b6c75798912489c7bab.tar glibc-9cd4747089e6b0d6ed6b2b6c75798912489c7bab.tar.gz glibc-9cd4747089e6b0d6ed6b2b6c75798912489c7bab.tar.bz2 glibc-9cd4747089e6b0d6ed6b2b6c75798912489c7bab.zip | |
Add new macro IN_MODULE to identify module in which source is built
The current scheme to identify which module a translation unit is
built in depends on defining multiple macros IS_IN_* and also defining
NOT_IN_libc if we're building a non-libc module. In addition, there
is an IN_LIB macro that does effectively the same thing, but for
different modules (notably the systemtap probes). This macro scheme
unifies both ideas to use just one macro IN_MODULE and assign it a
value depending on the module it is being built into. If the module
is not defined, it defaults to MODULE_libc.
Patches that follow will replace uses of IS_IN_* variables with the
IS_IN() macro. libc-symbols.h has been converted already to give an
example of how such a transition will look.
Verified that there are no relevant binary changes. One source change
that will crop up repeatedly is that of nscd_stat, since it uses the
build timestamp as a constant in its logic.
* Makeconfig (in-module): Get value of libof set for the
translation unit.
(CPPFLAGS): Use $(in-module).
* Makerules: Don't suffix routine names for nonlib.
* include/libc-modules.h: New file.
* include/libc-symbols.h: Include libc-modules.h
(IS_IN): New macro to replace IS_IN_* macros.
* elf/Makefile: Set libof-* for each routine.
* elf/rtld-Rules: Likewise.
* extra-modules.mk: Likewise.
* iconv/Makefile: Likewise.
* iconvdata/Makefile: Likewise.
* locale/Makefile: Likewise.
* malloc/Makefile: Likewise.
* nss/Makefile: Likewise.
* sysdeps/gnu/Makefile: Likewise.
* sysdeps/ieee754/ldbl-opt/Makefile: Likewise.
* sysdeps/unix/sysv/linux/Makefile: Likewise.
* sysdeps/s390/s390-64/Makefile: Likewise.
* nscd/Makefile: Set libof-* for each routine. Set CFLAGS and
CPPFLAGS for nscd instead of nonlib.
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/iconv/Makefile b/iconv/Makefile index 48d17d7a55..8031a88bd1 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -52,11 +52,12 @@ CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"' CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"' CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"' -CPPFLAGS-iconv_charmap = -DNOT_IN_libc -CPPFLAGS-linereader = -DNOT_IN_libc -CPPFLAGS-strtab = -DNOT_IN_libc -CPPFLAGS-charmap = -DNOT_IN_libc -CPPFLAGS-charmap-dir = -DNOT_IN_libc +CPPFLAGS-iconvprogs = -DNOT_IN_libc + +# Set libof-* for each routine. +cpp-srcs-left := $(iconv_prog-modules) $(iconvconfig-modules) +lib := iconvprogs +include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) ifeq ($(run-built-tests),yes) xtests-special += $(objpfx)test-iconvconfig.out |